From ad0eac19c7a1f0046979ad8923f6ac1b7c2d7696 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=98yvind=20Kol=C3=A5s?= Date: Tue, 23 Jan 2018 16:09:34 +0100 Subject: [PATCH] release 0.1.42 --- NEWS | 3 +++ babl/babl-space.c | 13 +++++++------ configure.ac | 2 +- meson.build | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/NEWS b/NEWS index 253def8..2e154e9 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,9 @@ the news section both in the README and the webpage. --> +2018-01-23 babl-0.1.42
+Fully initialize fishes when loading from cache.
+
2018-01-16 babl-0.1.40
Added format "CIE XYZ alpha" color model and formats. New API babl_process_rows for reduced overhead in some scenarios; though bigger diff --git a/babl/babl-space.c b/babl/babl-space.c index 781e419..6794c2c 100644 --- a/babl/babl-space.c +++ b/babl/babl-space.c @@ -575,7 +575,7 @@ static void prep_conversion (const Babl *babl) static inline void -universal_nonlinear_rgb_converter (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples) +universal_nonlinear_rgba_converter (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples) { const Babl *source_space = babl_conversion_get_source_space (conversion); const Babl *destination_space = babl_conversion_get_destination_space (conversion); @@ -681,6 +681,7 @@ universal_nonlinear_rgb_u8_converter (const Babl *conversion,unsigned char *src_ rgba_out[i*4+0]=in_trc_lut[rgb_in_u8[i*3+0]]; rgba_out[i*4+1]=in_trc_lut[rgb_in_u8[i*3+1]]; rgba_out[i*4+2]=in_trc_lut[rgb_in_u8[i*3+2]]; + rgba_out[i*4+3]=rgb_in_u8[i*3+2] * 255.5f; } babl_matrix_mul_vectorff_buf4 (matrixf, rgba_out, rgba_out, samples); @@ -730,7 +731,7 @@ static inline void babl_matrix_mul_vectorff_buf4_sse2 (const float *mat, static inline void -universal_nonlinear_rgb_converter_sse2 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples) +universal_nonlinear_rgba_converter_sse2 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples) { const Babl *source_space = babl_conversion_get_source_space (conversion); const Babl *destination_space = babl_conversion_get_destination_space (conversion); @@ -862,11 +863,11 @@ add_rgb_adapter (Babl *babl, NULL)); prep_conversion(babl_conversion_new(babl_format_with_space("R'G'B'A float", space), babl_format_with_space("R'G'B'A float", babl), - "linear", universal_nonlinear_rgb_converter_sse2, + "linear", universal_nonlinear_rgba_converter_sse2, NULL)); prep_conversion(babl_conversion_new(babl_format_with_space("R'G'B'A float", babl), babl_format_with_space("R'G'B'A float", space), - "linear", universal_nonlinear_rgb_converter_sse2, + "linear", universal_nonlinear_rgba_converter_sse2, NULL)); prep_conversion(babl_conversion_new(babl_format_with_space("R'G'B'A u8", space), babl_format_with_space("R'G'B'A u8", babl), @@ -899,11 +900,11 @@ add_rgb_adapter (Babl *babl, NULL)); prep_conversion(babl_conversion_new(babl_format_with_space("R'G'B'A float", space), babl_format_with_space("R'G'B'A float", babl), - "linear", universal_nonlinear_rgb_converter, + "linear", universal_nonlinear_rgba_converter, NULL)); prep_conversion(babl_conversion_new(babl_format_with_space("R'G'B'A float", babl), babl_format_with_space("R'G'B'A float", space), - "linear", universal_nonlinear_rgb_converter, + "linear", universal_nonlinear_rgba_converter, NULL)); prep_conversion(babl_conversion_new(babl_format_with_space("R'G'B'A u8", space), babl_format_with_space("R'G'B'A u8", babl), diff --git a/configure.ac b/configure.ac index 7c81c6b..7499762 100644 --- a/configure.ac +++ b/configure.ac @@ -14,7 +14,7 @@ AC_PREREQ(2.54) m4_define([babl_major_version], [0]) m4_define([babl_minor_version], [1]) -m4_define([babl_micro_version], [41]) +m4_define([babl_micro_version], [42]) m4_define([babl_real_version], [babl_major_version.babl_minor_version.babl_micro_version]) m4_define([babl_version], [babl_real_version]) diff --git a/meson.build b/meson.build index bfd4ae4..d18db0a 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('babl', 'c', license: 'LGPL3+', - version: '0.1.41', + version: '0.1.42, meson_version: '>=0.40.0', default_options: [ 'sysconfdir=/etc', -- 2.30.2